From: Juanma Barranquero <lekktu@gmail.com>
Date: Tue, 5 Jun 2007 10:06:19 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18647
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=000af79b182d0feb0a9661aaeda7f4515ecbd4e9;p=emacs.git

*** empty log message ***
---

diff --git a/src/ChangeLog b/src/ChangeLog
index 4b14d169604..b8067128cb2 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,8 +1,12 @@
+2007-06-05  Juanma Barranquero  <lekktu@gmail.com>
+
+	* xfaces.c (Finternal_lisp_face_p): Signal error for face alias loops.
+
 2007-06-03  Nick Roberts  <nickrob@snap.net.nz>
 
 	* keyboard.c (discard_mouse_events): Add GPM_CLICK_EVENT case.
 
-	* frame.c (Fmouse_position, Fmouse_pixel_position): 
+	* frame.c (Fmouse_position, Fmouse_pixel_position):
 	Condition on HAVE_GPM too.
 
 	* term.c (term_mouse_highlight): Remove unused variables.